Merge branch 'hotfix/2013-06-16-hotfix-sentry-2'
Merge branch 'develop'
Code around sysadmin rigidity
Merge branch 'hotfix/hotfix_2013_06_18_sysadmin' into develop