Merge branch 'eclipse-3.6-compat' into logicalModelSupport-3.6