Integration branches

Big changes are batched in a branch and tested there before they go to master. This is where each branch stands.