Merge pull requests

Merge pull requests.