Merge branch 'libpmem'