catchup with runtime 46d902c4bff142c400a2fada2e445adfbc8ecd39
fix whitespace/warnings
travisplexer: pr-104-arm travis ci test