ensure driver returns non-zero when failing so that the build can pick up errors
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'