master-kl-63

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