600D slurp #2
Created originally on Bitbucket by OtherOnePercent (One Percent)
Was already merged in Bitbucket before import, marked as merged by the import user
Source changeset not longer availableat the time of import. Commit listwill look empty
I did HG transplant but it threw the other changes into unified... dunno why.