Merge origin/master

Conflicts:
	src/main/java/mycode/gae/camel/processor/Processors.java