Merge pull request #354 from svost/c++11