Sorry, can't figure out how to create a pull-request on github if another one is still open. So here's the commit I'd suggest to merge: 8e295a88a9a287052d7b3e7b26b6f99f1f26706f
