Add missing self-install, tripping up dependencies
Merge remote-tracking branch 'upstream/master'