cs injection on 20140410-101827
Merge commit '1e8f19464ecb764eae41de81b617445a52a13733' into HEAD