[sr-dev] git:master:384a5338: Merge pull request #1283 from dunst0/patch-1