really fixed now
Merge branch 'master' into stable