[sr-dev] git:master:cb4cd24b: Merge pull request #959 from vance-od/master