Merge branch 'danjean' into bleed