Fixed some special fusions.
Combined the changed special fusions into the master file.
Added special fusions and the fusion history.
Merge remote-tracking branch 'origin/master' into gh-pages