Testing PR icecave/testing#20
Merge branch 'master' of github.com:jmalloc/meta-testing

Conflicts:
	composer.lock