Merge version 1.1.0-wip into master