Merge branch 'inex-live'
Version bump and changelog