reintegrate ^/branches/taxeditor/3.0.11-SNAPSHOT