Merge master to taglib2

Including #352 and #354.