master-kl-116

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