Ensuring work from macbookpro2 windows VM is not lost
Ensuring anything from macbookpro2 windows VM is not lost
Merge remote-tracking branch 'origin/master'