Import
Merge branch 'master' of github.com:pellaeon/local_manifests