master-qa-6765

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