Back to magit from master branch. Let's see how long it takes these guys to break it... again.