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