Merge branch 'anross-master'

* 1.1.2 release merge