Merge pull request #1046 from arfett/master