2.1.6 for justice
Merge branch '2.1' of github.com:vanilla/vanilla into 2.1