Merged changes from jtalks-org:master

Merged "Remember me doesn't work for some people."