Remove Incorrect Type Message
Merge remote-tracking branch 'origin/simplify-travis' into simplify-travis