address comments by peterbe
Merge branch 'hotfix/1.12.1-LL'