Merge remote-tracking branch 'upstream/master'
authorDavid Llewellyn-Jones <david@flypig.co.uk>
Mon, 23 Jun 2014 01:00:46 +0000 (02:00 +0100)
committerDavid Llewellyn-Jones <david@flypig.co.uk>
Mon, 23 Jun 2014 01:00:46 +0000 (02:00 +0100)

Trivial merge