Merge remote-tracking branch 'origin-master' into c++11