mozilla/fxa-content-server — pull request #950 by ckarlof (2014-04-18 21:18:26+00:00)
Title: Train 10

Merge train-10 hot patch back into master.