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