Include changes suggested by @ageis
Merge branch 'develop' of https://github.com/freedomofpress/securedrop into develop
Merge pull request #681 from runasand/develop

Include changes suggested by @ageis