cs injection on 20140411-051303
lt injection on 20140411-051303
Merge commit '72649e3a54fc9e004e1a6b4cc6efb1b8ff5656ef' into HEAD