Merge branch 'upstream-master'

Conflicts:
	pom.xml
	src/main/java/org/mule/mvel2/ParserContext.java