Merge pull request #998 from master