Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Wed, 16 Nov 2016 19:58:33 +0000 (11:58 -0800)
committerMark Wells <mark@freeside.biz>
Wed, 16 Nov 2016 19:58:33 +0000 (11:58 -0800)

Trivial merge