VE sprint 6

**DO NOT MERGE until sprint work is completed**

https://wikia-inc.atlassian.net/secure/RapidBoard.jspa?rapidView=60&view=reporting&chart=sprintRetrospective&sprint=116