master-qa-6661

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