Merge pull request #707 from parkera/sr2988