Merge all the forks

It is time to merge all this stuff.