Merge branch 'master' into taglib2

To incorporate a bug fix.