Merge pull request #974 from lijpsummer/master