It looks like you need to rebase this, this is already in master.