No diamond-breaking under quantifiers (resolves bug #550).
Merge branch '1.3.x'