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

Trivial merge