Merge branch 'master' into ui to get Jenkins timeout fix, among other things.