Merge branches 'release' and 'fluff' into release