Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
improve implicitSize management
Merge pull request #80 from Flamaros/master

Small re-factoring on TextItem