Merge branch 'master' into literature-search

Conflicts:
.gitignore