gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/75cc34a2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/98e8e4c7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/66440cb2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c0f3147a (commit)



commit 75cc34a2db2fa7466039e942a86810c06c32c298
Merge: c0f3147 98e8e4c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Sep 3 12:06:52 2017 +0200

    Merge branch 'maint'
    
    Resolved conflicts:
    	gnucash/import-export/CMakeLists.txt

commit 98e8e4c767326c19ea678ddf804a0651396b0c17
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Sep 3 12:05:00 2017 +0200

    Only build aqbanking when requested

commit 66440cb203b1af7b2e484ee71448653b8410b173
Author: Sumit Bhardwaj <bhardwajs at users.noreply.github.com>
Date:   Sat Sep 2 13:53:54 2017 -0700

    Added WITH_OFX fix to CMakeLists in gnucash/import-export/ofx



Summary of changes:
 gnucash/import-export/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)