Merge branch 'inline'