Merge commit 'obnox/master-rebase'