Fixed merge conflicts

9 jobs for 1.1.0 in 26 minutes and 26 seconds (queued for 2 seconds)
latest