master-qa-9295

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