#1280 - Theme editor updating, but not giving green notice
Merge branch 'master' into 1245_and_1260_updates