Resolve
authorMike Taylor <mike@indexdata.com>
Thu, 14 Aug 2014 14:03:03 +0000 (15:03 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 14 Aug 2014 14:03:03 +0000 (15:03 +0100)

Trivial merge