master-lps-36500

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