Merge commit 'dkg/master'

diff --cc src/common
Simple merge

diff --cc src/subcommands/ma/add-certifier
index 04842286039285e38a4d489fe4b4b4f292f04a4a,9ad0515efa35af4922cb2294135b6dc75a4f679c..0c3c647663db387a98ed70e88574f7b8e9ca4cdc
mode 100755,100644..100644
--- 1/src/subcommands/ma/add-certifier
--- 2/src/subcommands/ma/add-certifier
+++ b/src/subcommands/ma/add-certifier

diff --cc src/subcommands/ma/list-certifiers
index 26989c6c05c41f285b2a587eb4c18b58f8913188,83f77869c063ea55deb1fad83dccb083a1dacc9e..e37485ead6bbba2e0ac2455c98c14361ea1f674b
mode 100755,100644..100644
--- 1/src/subcommands/ma/list-certifiers
--- 2/src/subcommands/ma/list-certifiers
+++ b/src/subcommands/ma/list-certifiers

diff --cc src/subcommands/ma/remove-certifier
index 2100b2d9ea8a5335db598faddaaa1234dd888422,59d3f0c3f7203ad38e5475e44ddd1f54efb33708..560281dfc2583e8932b6e07f42bda2682e0323ff
mode 100755,100644..100644
--- 1/src/subcommands/ma/remove-certifier
--- 2/src/subcommands/ma/remove-certifier
+++ b/src/subcommands/ma/remove-certifier

diff --cc src/subcommands/ma/update-users
index d3a72dc183d811bd1641349bb2c16cecdd4fcd5e,0335e31448f9b3dbc409bf71af406f62ff5cc27f..73685f6ddce6d532cd168065fadf5ef50145e55d
mode 100755,100644..100644
--- 1/src/subcommands/ma/update-users
--- 2/src/subcommands/ma/update-users
+++ b/src/subcommands/ma/update-users

diff --cc src/subcommands/mh/publish-key
index 7baefc4d7670e21868019fca2388ea5b51aa0c7c,6c69569fb601dba05a747125632069ca617e7def..b7ab01d8a247b1e114d50b3fda15e591e2029e86
mode 100755,100644..100644
--- 1/src/subcommands/mh/publish-key
--- 2/src/subcommands/mh/publish-key
+++ b/src/subcommands/mh/publish-key