master-qa-2959

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