rd image
Bugfix #291
Merge branch 'master' into postgresql