master-qa-9660

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