Merge pull request #830 from apache/master

Also fix the conda-build in dev branch