fix rc.local
Merge remote-tracking branch 'origin'