update label markup
Merge remote-tracking branch 'upstream/master'
Update screenshots
Merge remote-tracking branch 'upstream/master'