Merge pull request #821 from apache/master

Update dev branch from master after merging SINGA-323