docs
Merge remote-tracking branch 'origin/master'
trying to fix a travis failure