Pushed through current development of 1.1.2

see the changelog for details