Merge pull request #816 from apache/master

Update dev branch due to master branch hot-fix of onnx example error