[pull] develop from freedomofpress:develop#194

pull[bot] merged 2 commits intoppker:developppker/securedrop:developfrom

freedomofpress:developfreedomofpress/securedrop:developCopy head branch name to clipboard