Merge branch 'master' into urlstate
authorMike Taylor <mike@indexdata.com>
Fri, 1 May 2015 15:16:15 +0000 (16:16 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 1 May 2015 15:16:15 +0000 (16:16 +0100)

Trivial merge