Merge branch 'travis' of github.com:/PeterMosmans/openssl into travis
Merge branch 'travis' of github.com:/PeterMosmans/openssl into travis