master-kl-92

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