Update Vanilla to version 2.1.6
Merge branch 'develop'