By pshizh at 23:21 on July 17 in branch1
By pshizh at 23:31 on July 17 on branch1
By HP at 09:53 July 18 under master
HP at 10:39 July 18 on master
Merge remote-tracking branch 'origin/branch1'