Merge branch 'master' into Feat--Templates
Updates and stuff.
Merge branch 'Feat--Templates'