Version 2.1.2
Merge branch 'upstream'