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

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

1
2
ALTER TABLE "users" ADD "failed_login" timestamp with time zone DEFAULT NULL;
ALTER TABLE "users" ADD "failed_login_counter" integer DEFAULT NULL;