sq injection on 20140725-004939
Merge commit '8c2c1839eba1210042bcbd21010123bdce440ef6' into HEAD