Merge "Correct executable bit for source files [Take 2]"