brentonk Merge branch 'release-1.1.2'