Merge branch 'os/preserve-author' into pu

Pat Thoyts committed Oct 20, 2016 at 11:07 UTC bfe43447fb78d64c1cdf4b2046032a399edc4011

No changes.