Merge 'upstream/master' into upstream-updates

Stages upstream updates to merge into smc-connect.

Fixed Conflicts:
app/views/shared/_footer.html.haml
config/application.example.yml
spec/features/general/translate_spec.rb