Merge pull request #1 from mskurz/branch1

Branch1
file4
Merge pull request #2 from mskurz/master

req2