Mergeable

This branch has the merging of all the non-automatic and unmergables from all previous pull requests.