Merge pull request #723 from billhollings/master

Track supported instance and device extensions correctly.