Merge branch 'sirf/fixes' into fixes