reintegrated taxeditor-3.4 branch into trunk