MERGE TO STABLE

I'd forgotten to compare the per-instance overlap flag when 
comparing interface files, and that meant that consequential
recompilations weren't being triggered when the only change
was to add -fallow-overlapping-instances

Fixes Trac bug #824