Merge commit 'remotes/dkg/master'; commit 'remotes/enw/master'; commit 'remotes/greg...