Merged some pull requests manually.