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