Fix package loading (stop eieio being installed via package manager)
Merge remote-tracking branch 'upstream/master'

Updates.