RIMG v0.9.0
Merge pull request #2138 from joeyvandijk/master

RIMG v0.9.0