Merge branch 'dev'
Version 2.9

BAM!
Merge branch 'master' into dev