Merging .hpp changes done before forking

Some necessary for C++11 et other hacks