master-kl-95

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