Jb2

bring up-to-date with quincyatt, fixes the ril_class issue