master-qa-6795

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