sq injection on 20140522-092858
Merge commit '195f876bea7947b347d404c5c35e2f1bf2b5bd83' into HEAD
Merge commit '16f2c7a52576d422229c9a6420d27dcc6b4f8785' into HEAD