Merge with the newest branch

Merge on myself.