Fix for issue #763
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Fixing issue #764
Fixing issue #764