Merge branch 'master' into develop
Dear RST, render or I'll hurt you.
Merge branch 'release-1.1.2'