Improved merge for merge object options (e.g. media)
Merge branch 'next' of github.com:serenity/twtcst into next