Fixes rebase issues on SSL branch.
travisplexer: pr-96-arm travis ci test