cs injection on 20140410-101827
lt injection on 20140410-101827
Merge commit '376308794b8ab33cd94e7d8a8e11b7628d1d6dda' into HEAD