Merge remote-tracking branch 'upstream/master'

Conflicts:
HelloWorld/public_html/index.html