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