Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Mon, 17 Oct 2016 23:15:00 +0000 (16:15 -0700)
committerMark Wells <mark@freeside.biz>
Mon, 17 Oct 2016 23:15:00 +0000 (16:15 -0700)

Trivial merge