Template v1.5.11 Fixing reverse commit

Adding Jason's changes back in

@parleer
@JasonMcArtor