Merge
authorMike Taylor <mike@indexdata.com>
Mon, 29 Sep 2014 13:02:31 +0000 (14:02 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 29 Sep 2014 13:02:31 +0000 (14:02 +0100)

Trivial merge