Merge branch 'release/1.12-LL'
address comments by peterbe
Merge branch 'hotfix/1.12.1-LL' into develop
bump version to 1.13-LL