Merge branch 'trunk' into beta

git-svn-id: svn+ssh://svn.gnucash.org/repo/htdocs/branches/beta@22689 57a11ea4-9604-0410-9ed3-97b8803252fd