Added back in some lost changes :/
Merge branch 'master' of github.com:Alfresco/ThunderOps