Merge pull request from twbs:master