Trying fix for negative time to logout window issue...
Trying fix for negative time to logout window issue...
Merge branch 'develop'

* develop:
  Trying fix for negative time to logout window issue...
  Trying fix for negative time to logout window issue...