gitter on every test (to try)
Merge remote-tracking branch 'upstream/master'