Merge remote-tracking branch 'origin/master' into compose_focus

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

1
2
3
ALTER TABLE `users`
  ADD `failed_login` datetime DEFAULT NULL,
  ADD `failed_login_counter` int(10) UNSIGNED DEFAULT NULL;