magfest/ubersystem — pull request #572 by binary1230 (2014-09-21 15:36:58+00:00)
Title: cherry pick server time check from 8.5 branch

pulling this code from 8.5 branch