Add two more places
Merge remote-tracking branch 'upstream/pr/174' into gh-pages