Merge c++14 changes to release
Merge doc changes from trunk
Merge test fixup to release