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