[sr-dev] git:master:61383110: Merge pull request #388 from giavac/master