Hopefully this is the right way to do it.
rebased onto f47af823f406f24b365278fd7cc77dd0355e8130
Pull-Request has been merged by sgallagh
Hopefully this is the right way to do it.