Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
authorMark Wells <mark@freeside.biz>
Wed, 14 Dec 2016 20:55:27 +0000 (12:55 -0800)
committerMark Wells <mark@freeside.biz>
Wed, 14 Dec 2016 20:55:27 +0000 (12:55 -0800)

Trivial merge