master-kl-64

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