Mule 3.x

Updating base with MuleSoft's changes