Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
authorMark Wells <mark@freeside.biz>
Sun, 20 Sep 2015 20:00:57 +0000 (10:00 -1000)
committerMark Wells <mark@freeside.biz>
Sun, 20 Sep 2015 20:00:57 +0000 (10:00 -1000)

Trivial merge