sq injection on 20140725-004939
Merge commit 'a2eb99d358b6f8607d37ad868d3d49164a52f47b' into HEAD