cs injection on 20140415-004848
Merge commit '5581f5aa0ca62acea72719058941ba9e616ba5df' into HEAD