Merge commit 'origin/master'
[eyes-widget] / welcome