Merge pull request #1407 from mirage/master

Mirage: Be more explicit with package requirements