1.3.0rc2 merge to OpenMEAP