Fixed an issue that was causing builds to fail in brew.
Merge branch 'master' into devel

Conflicts:
	pom.xml