Merge remote branch 'upstream/kibana-ruby' into kibana-ruby

Conflicts:
	public/lib/js/ajax.js
Fix timezone calc in `stream' and coding style