master-kl-119

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