master-qa-6031

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