Q1.5 fixed
Merge branch 'master' of https://github.com/blegat/LINMA1170