Merged updates from MiniKeePass
Merge branch 'master' of https://github.com/mstarke/MiniKeePassLib