Resolve conflicts
authorMike Taylor <mike@indexdata.com>
Fri, 14 Nov 2014 12:48:18 +0000 (12:48 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 14 Nov 2014 12:48:18 +0000 (12:48 +0000)

Trivial merge