Merged in 3 pull requests.