up directory wait-time for K. Thomas at FSU
Merge remote branch 'origin/master'