Merge branch 'master' into 'joblist'

# Conflicts:
#   app/views/home/_banner_and_search.html.erb
#   config/application.rb