increased timeout for fetching taxonset in calculate
Merge branch 'master' into stable