STFU, travis
Merge remote-tracking branch 'jlee-r7/stfu-travis'