Merge branch '3.1.x' into testing
Merge branch 'testing' of https://github.com/vsingleton/liferay-faces into testing