master-qa-10942

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