Last commit didn't work on travis for gcc. try again.