master-qa-6830

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