Brought HEAD back up to date with the new C++11-like variant