Merge 1.2 into master#214

roastario wants to merge 7 commits intomastercorda/token-sdk:masterfrom

merge_12_into_mastercorda/token-sdk:merge_12_into_masterCopy head branch name to clipboard