It's just two lines that have to be changed. The patch contributed by
Ivan Shmakov (which was applied to master back in October) is attached.