am 4e719144: Merge "By convention const goes before the type specifier"

* commit '4e7191448d5b1eae5181463b6a553fed9cbca3e5':
  By convention const goes before the type specifier