rebased onto de46b572522b3add2702b5a1d306d3a8aac9392a
That's looks good to me, the only thing I can think is that it might break the vagrant env but I pretty sure it is already broken.
Let's merge as is and see about vagrant in another PR then :)
Pull-Request has been merged by pingou