Merge branch 'master' of git://github.com/eeaston/pkglib
Merge branch 'master' of github.com:oisinmulvihill/pkglib