master-lps-41885

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