WIP: Master

Ghislain Loas requested to merge master into Nanook_WIP