Changed gitstatus script to a more portable one
Merge branch 'master' into minimal