Merge branch 'beta'
Removed extra
Busted cache
Merge branch 'master' into beta