increase max runtime to 90 minutes
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'