manually merge in some pull requests