Merge “Support new package file management scheme” into master
authorBob Gallagher <bob.gallagher@riftio.com>
Wed, 3 May 2017 21:37:52 +0000 (17:37 -0400)
committerBob Gallagher <bob.gallagher@riftio.com>
Wed, 3 May 2017 21:40:51 +0000 (17:40 -0400)
* commit '6051adb19db86ff89f3b0ce0a339c2f5ccea9522':

Signed-off-by: Bob Gallagher <bob.gallagher@riftio.com>

Trivial merge