fix for issue #785
Fix for issue 791
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop