Merge pull request #3219 from austinpagan/Gemm.ErrorFix