master-qa-6820

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