master-qa-6660

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