Merge with wmcbrine/master.
Merge branch 'master' into testing