Undoed aa93d2346f840e16a05c6546e1e22c1dddfbc997 (issue #206), so that
now tags are once again placed on a merge commit