master-qa-4058

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