travis: backport improvements from other FGRE projects