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