Merge branch 'ingenic' into devel