Merge branch 'design_merge'
Merge branch 'master' into design_merge
Fix stupid tagging error