master-qa-6744

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