Merge branch 'master' into develop
Remove epa-file-encrypt line from orgmode line.
Merge branch 'fix/remove-encto-orgmode'