Merge pull request #675 from alblue/sr2879