Fix for http://ezix.org/project/ticket/668

This will be fixed upstream and we don't have to merge in our fork,
hopefully soon. Just keep this updated here so that I don't lose it.

Change-Id: I6f4e766ea5da827b06fbdf4cf08ad77f1e8add16
Merge "Fix for http://ezix.org/project/ticket/668"