Increase test timeout to try to prevent occasional spurious Travis-CI failures
Merge branch 'master' into exportAsgnModifiers