Merge branch 'openindie'