master-qa-4721

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