Security backport
Merge branch '2.1' of github.com:vanillaforums/Garden into 2.1
Adds filtering to BodyBox format
Backports 005f2e0 to fix timezone offset
2.1.2, aw yeah