Preparation for building on travis-ci...