Merge fix for euphorie/Euphorie#75.