Testing 2.x with woodhouse 0.3.1
Merge branch 'master' of github.com:jmalloc/meta-testing

Conflicts:
	composer.lock
Re-added woodhouse