am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member" * commit '5f677699': Fixed inline initialization of non-integral static const member