Changes for OF mode Soylent Independancy changes
Merge remote-tracking branch 'origin/master' into PopTrack-Laptop
Merge pull request #1 from SoylentGraham/PopTrack-Laptop

Merge up to master