Merge branch 'dblock' into 'master'

Store the password for future reuse.

See merge request !4
1 job for master in 42 seconds (queued for 11 seconds)