WIP: New prod

This branch is here to keep track of what needs to be integrated up-stream and to exploit Travis ;-)