Bring CHANGES up to date with trunk. Specifically by merging r1485413, r1485427, r1485497, r1485501, r1486572