Merge pull request #1111 from liushuyu/master