Merge branch 'RSpec-tests' into static-pages
Merge branch 'static-pages'