Merge remote-tracking branch 'nagn/fantasticgibs'

Conflicts:
	Source/gg2/Scripts/_resources.list.xml

This merge no change - all the changes were already cherrypicked into the xmas branch that was merged before. The merge is just supposed to visibly "close" this branch.