Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
authorMark Wells <mark@freeside.biz>
Thu, 8 Sep 2016 21:54:58 +0000 (14:54 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 8 Sep 2016 21:54:58 +0000 (14:54 -0700)

Trivial merge