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

Trivial merge