user avatar
Merge branch 'develop-1.0.6'
Benoit Mortier authored
e27f5c48