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

Trivial merge