Adjustments for SAL-64
Merge branch 'master' of https://github.com/aldrin15/supercms