Merge in some changes from 3.14.1 that compile fine under 3.13.x
formatting fixes