Merge pull request #1152 from ryanjbaxter/master

Updated security token TTL