Merge branch 'master' of github.com:figarocms/cucumber-jvm-fixtures

Conflicts:
	pom.xml