Fix up travis.
Code style change based on apenney comments
Merge remote-tracking branch 'upstream/master' into 1.x

Travis changes.