master-qa-5525

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