1st step to port picasso
Merge branch 'master' of https://github.com/n-t-roff/DWB3.3