Merge "Drop GCC back to C++11." am: dba46710fe am: a01ec70d92
am: bcaf671bb6

* commit 'bcaf671bb6aba1b49efc930a330977d07ac7cef6':
  Drop GCC back to C++11.