Merge commit 'dkg/master'; commit 'enw/master'; commit 'micah/master'; commit 'mlcast...