Merge branch 'providence-ri' into gh-pages