Moving bundler version up
Merge remote-tracking branch 'upstream/master' into refactor

Conflicts:
	gooddata.gemspec