Update timer from develop.

This commit is contained in:
Automated Commit 2015-10-27 17:30:06 -04:00
parent b5b693c341
commit 1bdc3c6239

@ -1 +1 @@
Subproject commit 00ed15d83a60158a2b976ea11148225c63aae00e
Subproject commit da677f6749b94f851458cf3b798a8ec46ed0d4fb