Master on 12/13/16 before we deleted the sensor structure

We did a big purge of references to the sensor structure. This tag/release is just before we did this.