Merge branch 'master' into the_nice