Change for C++14 support in Clang 3.5
Merge branch 'release/3.0.0'