Merge remote-tracking branch 'origin/0.3.4-fix-GPGProblem-590'
Merge branch '0.3.4-feature-move-594' into testing