Merge remote-tracking branch 'upstream/master'

Conflicts:
	default.hbs
	index.hbs
ergh