- Changed some waitForFinished(-1) to the default 30 seconds version.
Merge branch 'master' of https://github.com/aarnt/octopi