Merge branch 'testing'
Odds n sods
Merge branch 'master' into testing