sq injection on 20140510-004924
Merge commit 'b0b3a3e17cd1d0c67cc66ebf0ea6966749be3f6b' into HEAD