Merge remote-tracking branch 'origin/master'

Conflicts:
	source/index.html.haml