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