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