Merging r14494 through r15285 into /home/andreas/workspaces/_svn-trunk/taxeditor...