row fix
Merge branch 'master' into pablo