Merge branch 'master' into v1.1 79/1279/1
-rw-r--r-- 15 file1.txt
-rw-r--r-- 12 file2.txt
-rw-r--r-- 34 file3.txt