Fix for issue #897
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop