Travis config.
Merge remote-tracking branch 'upstream/master' into 2fa