Merge pull request !279 from maweiye/master
mentioned in commit 1f893a39
mentioned in commit 0d7a48ff