failing text "fixed"
Merge branch 'master' into release