More steps to getting tuplebase building again.
Merge branch 'master' of github.com:zoolib/zoolib_cxx