master-qa-9611

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