State of work computer. Moving to home computer for weekend.
Merge commit '3ded0a1f2dc6eb32bab84de6950ffcfa530288f4' into contentpacks
WIP
Removed plugin.pyc