Merge branch 'release/0.3.5' into develop
Makefile fix and updated workflow
Keyringer 0.3.6
Merge branch 'release/0.3.6'
Imported Upstream version 0.3.6