Merge branch 'master' into tuchfarber/fix_empty_file_error_wording
authorCamila Ayres <smayres@gmail.com>
Fri, 12 Apr 2019 14:51:36 +0000 (16:51 +0200)
committerGitHub <noreply@github.com>
Fri, 12 Apr 2019 14:51:36 +0000 (16:51 +0200)

Trivial merge