master-qa-6525

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