Merge branch 'master' into beta
Tempalte cleanup
Merge branch 'beta'