Merge branch 'master' of https://github.com/apache/singa into dev