master-kl-94

http://issues.liferay.com/browse/LIFERAYQA-4985