fix for LEFT JOIN
Merge branch 'security' into rails32