Corrections from my recent random fusions.
Combined the changes to the demons.
Merge remote-tracking branch 'origin/master' into gh-pages