Merge pull request #921 from guangyang/dev

merge from master to dev