Patches come from 

Moray.Henderson@ict.om.org