Increase timeout in an attempt to prevent timout python failure
Merge branch 'master' into bennodiscovery