sq injection on 20140531-004839
Merge commit '31d5b6637f06348ed3ba8d33e0d45247afaebce8' into HEAD