Devices now sorted, "any" is default device for non-gpu systems
Merge remote-tracking branch 'origin/master' into PopTrack---desktop