Fixes after rebase
travisplexer: pr-574-arm travis ci test