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