master-kl-122

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