master-qa-4626

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