auto-merge staging into master
auto-merge staging into master
Basic <picture> support