merge master to dev as SDL wallet using these commits #3

Merged
duke merged 10 commits from dev into master 3 years ago