Merge pull request from CppCon/master