SimonSapin Merge branch 'nll-1.6'
Latest commit a07eac0 Aug 23, 2018