Issue 781

Created by: mardy

This is taken from https://code.launchpad.net/~morphis/aethercast/+git/aethercast/+merge/310189, which was mentioned in https://bugs.launchpad.net/aethercast/+bug/1590135