Merge branch 'master' into taglib2

to settle the conflicts I have caused.