cleanup
Merge remote-tracking branch 'origin/cpp14' into cpp14