master-lps-40918

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