Fixed case-sensitive, absolute file paths
Merge remote-tracking branch 'origin/development' into development