Use --force to make sure every package is installed
Merge remote-tracking branch 'upstream/master'