master-qa-6346

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