Updated fix to XP file extension problem
Merge remote-tracking branch 'Greg's_Fork/master' into development