Merge branch 'hcidump_master'