Merge pull request #3415 from jrgm/train-2013.05.08

Train 2013.05.08 - Fix for users who are unable to sign out.