Make the code more generic, so that we can capture Antenna scans as well.
Merge remote-tracking branch 'origin/API-20140530' into API-20140530