Merge remote-tracking branch 'origin/master'
Make some order (part 2)