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

* commit '5f67769903dfb3e459ea8d42e50289ec300fe983':
  Fixed inline initialization of non-integral static const member