Preparing release 2.1.2
Back to development: 2.1.3
merge latest