master-lps-42136

http://issues.liferay.com/browse/LPS-42136