sq injection on 20140806-005235
Merge commit '10e38281fff924d22cb15a13367e0d2049e912e8' into HEAD