Merge branch 'release/r2' into develop
only from source=humorix_misc
Merge branch 'release/r3'