[sr-dev] git:master:616ece6d: Merge pull request #839 from albertollamaso/master