merge pls

Stories Included In PR:
58665390: [500 if login after clearing browser data under certain conditions](http://www.pivotaltracker.com/story/show/58665390) [TB]

---
Commits Included in PR for Story 000000:


---
Commits Included in PR w/o Owner and Story ID: