Master porting
This merge will bring master up-to-date with dist-master and will allow to merge without conflits brian-porting and cantel-porting branches
This merge will bring master up-to-date with dist-master and will allow to merge without conflits brian-porting and cantel-porting branches