Merge branch 'master' into urlstate
authorMike Taylor <mike@indexdata.com>
Mon, 11 May 2015 13:34:06 +0000 (14:34 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 11 May 2015 13:34:06 +0000 (14:34 +0100)

Trivial merge