master-qa-9713

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