Code around sysadmin rigidity
Merge branch 'hotfix/hotfix_2013_06_18_sysadmin'