Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor