Nerve Gear changes
Merge remote-tracking branch 'origin/bfox'