master-kl-114

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