Merge branch 'v1.4' of jpellegrini/package-feed into v1.4