[MINOR] Sync 0.5 branch with master branch changes

Author: zombieJ <smith3816@gmail.com>

Closes #937 from qingwen220/master.
3 files changed