merging in C++ 2014 Update 1

It has nothing applicable to us in it, but best to stay up to date to
eliminate possible causes of field failures.