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