Merge branch 'build_fix' into cris