Merge pull request #826 from apache/master

Forward the onnx fix to dev