C++11 and Python 3 initial conformance. Reset this has after merge changed the hash of the original version.