update from no-job.ru
Merge remote-tracking branch 'origin/master'