Prepare for 2.1.2 release
#253
+6
−3
Merged
2.1.2 release
#253