Clarify wait time in comments, and reduce the second wait
Merge branch 'master' into develop