Merge branch 'master' into fix_is_namedtuple_dict_fu