Finish thrall/familiar compression options
Merge branch 'master' into thrall

Conflicts:
	mrscript.user.js