user avatar
Merge branch '1.0.18-fixes'
Benoit Mortier authored
71c831dd