Fix typo and C++14 issue with capture
Merge branch 'master' into typed-log