Merge branch 'master' into 'stable'
Bastien Ho authored
v1.5

See merge request !4
f898123d