Merge branch 'master' into urlstate
authorMike Taylor <mike@indexdata.com>
Fri, 8 May 2015 19:41:23 +0000 (20:41 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 8 May 2015 19:41:23 +0000 (20:41 +0100)

Trivial merge