Merge branch 'patches' into pu

Pat Thoyts committed Oct 3, 2016 at 23:28 UTC 408c2120e02cf2a96cd44c69fe3baf406d4de157

No changes.