Merge remote-tracking branch 'upstream/master' into weekly-report-30-11

Conflicts:
	2014-12/WR-2014-12-01.md