Keeping lock for Travis
Merge remote-tracking branch 'upstream/master'
Move to supporting virtual packages