Merge branch 'Bandit'
Merge branch 'master' into Bandit