[sr-dev] git:master:f9115fc5: Merge pull request #1266 from asiplas/master