fix to path problems for travis
Merge remote-tracking branch 'upstream/master'