master-qa-4627

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