Merge branch 'master' into urlstate
authorMike Taylor <mike@indexdata.com>
Fri, 22 May 2015 07:10:25 +0000 (08:10 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 22 May 2015 07:10:25 +0000 (08:10 +0100)

Trivial merge