Add bundler files.
Merge remote-tracking branch 'origin/v7' into v7

Conflicts:
	.gitignore