Tentative support for really ugly picture source element
auto-merge staging into master