Merge remote-tracking branch 'upstream/master' into translate-into-japanese-v0.13

Conflicts:
	getting_started/12.markdown
	getting_started/2.markdown
	getting_started/5.markdown