Merge branch 'master' of dbgit.prakinf.tu-ilmenau.de:code/nvm-based_data_structures

3 jobs for master in 5 minutes and 35 seconds (queued for 2 seconds)