Pushed to upstream

cc/ @igorspasic-liferay @hhuijser.