commentary to 1024px
Merge branch 'master' into ricardo