fix for reals
Merge branch 'master' into release