fixed pattern matching with log lines that have more optional parameters
Merge branch 'master' of git@github.com:micheleorsi/logstash.git

Conflicts:
	patterns/google-app-engine