Allow reading password from a file
Merge branch 'BarthV-passwordfile' into develop