am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14."

* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.