user2 did some changes
Merge branch 'master' into user1