use 2.1.2 not 2.1.1
Merge branch 'develop' into staging