Merge branch 'master' of /scratch/mine/libcds