Merge pull request master from liferay/master