Merge pull request #869 from UtahDave/develop

fix 2 typos
15 seconds was too short a timeout. Leave default