master-qa-9830

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