Merge https://github.com/pyrocms/pyrocms into 2.3/develop
Merge branch '2.3/develop' of https://github.com/ChristianGiupponi/pyrocms into 2.3/develop