master-qa-6323

http://issues.liferay.com/browse/LIFERQAY-6323