(Hopefully) final changes pre-deploy to test 2013-09-17