Comment 7 for bug 834082

I've QA'ed this and things look fine in terms of everything working correctly in the standard case and being ok to deploy. I'm waiting to hear from Kate about if the her playing on qastaging confirms the bug is fixed for her.