Merge release v2.1.2 into master
Merge remote-tracking branch 'origin/master'

Conflicts:
	APO-DZ/build.gradle