Changed dreamhost time adjustment to 40 seconds
Merge branch 'dev' into beta