Merge branch 'master' into ppa for 3.1.5.
Authored by: Tony Houghton 2015-08-20
Parents: [08edcf][59724b]