Merge pull request #4630 from nicklowe/master