Issue #870 and Issue #877 done
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev