Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/Markdown/Markdown.cshtml