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

Trivial merge