Merge branch 'planetdump-ng'