Merge remote-tracking branch 'dave/makepkg'