Add stuff on Halloween.
Merge remote-tracking branch 'upstream/master'