master-kl-115

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