skipped one change
small fixes
Merge branch 'master' into niix