2015-06-03 - releng
11:58	<kart_>	Cherry-picked 213840 to test logstash	[releng]