I accidentally nuked !100 (closed), so here we go again. Positive side effect: I rebased it, so it's mergeable again ^^
