[sr-dev] git:master:c13ffc88: Merge pull request #1076 from mslehto/deadcode