Remove warnings, change check to not be ==: I assume that's right.
Merge remote-tracking branch 'origin/master'