Merge pull request #1300 from rrthomas/master

Slight tidy-up