Update preferred branch for pull requests
Merge remote-tracking branch 'upstream/master' into chinese

Conflicts:
	html/templates/contribute/index.html.ep