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