master-lps-39137

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