Merge "Correct executable bit for source files"