Correctly writing angle brackets in HTML
Putting info about hosted file first
Merge branch 'fix-flickr-error-message' into plugin-system