Remove warning: Using 'stringWithString:' with a literal is redundant
Merge remote-tracking branch 'upstream/master'