log?
Merge remote-tracking branch 'origin/2.0.x'

Conflicts:
	.gitignore