Comment 230 for bug 1512120

@Martin Dauskardt

The patch is based on the git master.