interim version
Merge branch 'master' into logstash-new-1.4.0

Conflicts:
	metadata.rb