gnucash master: Multiple changes pushed

[Mike Alexander]

> On Aug 10, 2015, at 3:05 AM, John Ralls <jralls at ceridwen.us> wrote:
> 
> I pushed the change Alex suggested to maint and that got my other change synced to Github so everything should be OK now.

I pushed changes to maint and master that I think fix things up.  They replace my change to gnu-fq-helper.in on master with your version of the same fix and put the parts of my change 142844db that relevant to maint on that branch.

              Mike