merge

--HG--
branch : enhancements
merge

--HG--
branch : enhancements
merged with v1.5

--HG--
branch : enhancements
simplified widget retrieval in render widget for slot function

--HG--
branch : enhancements
merge
'

--HG--
branch : enhancements