2.2/master

This will make it easier to test (and has some dependencies on) this other PR.

https://github.com/pyrocms/pyrocms/pull/2396