Why ever was this in here?
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop