Fixed conflicts.
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop