Merge "Bug 35671 - PHP Notice: Undefined index: gettoken in includes/api/ApiMain...