The merge from v2.6 to master in commit 18985643 seems to have gone horribly wrong. This should fix it.
