1.1.2 wip

Same as #49 but with a merge from master to get it up to date.