Merge pull request #635 from GetSimpleCMS/hotfixes

v3.2.3
Merge pull request #741 from GetSimpleCMS/release

Release v3.3.0
Merge branch 'stable' into hotfixes