Restore changes removed from bad merge
Merge pull request #382 from flodolo/merge_failure

Restore changes removed from failed merge