Merge pull request #3038 from ewerness-nv/extmicromapongithubmaster