master-qa-3610

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