Merge
authorMike Taylor <mike@indexdata.com>
Tue, 30 Sep 2014 15:52:07 +0000 (16:52 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 30 Sep 2014 15:52:07 +0000 (16:52 +0100)

Trivial merge