OC7 Launch Step 1

This branch will go live at midnight CET, 5am BST. Step 1 in the release.

@jospoortvliet @kelley @karlitschek @MariekevC 

<!---
@huboard:{"order":176.75,"custom_state":""}
-->

conflict marker