files are not executable
use branch labels too
Merge branch '3.0'