73172e2a0242cf62133e1f6a1d9a46f877c71302
CC: @mattdm for review - is this what you're looking for?
rebased onto 4d4c0dc8ede5a9d0ce56d4cd98bdb7078dc339cc
Looks good. Can't merge due to conflicts...
rebased onto 73172e2a0242cf62133e1f6a1d9a46f877c71302
merging with fixed conflicts
Pull-Request has been merged by bex
CC: @mattdm for review - is this what you're looking for?