Ah! Thanks - this is due to a bad git merge. I'll fix it now.