cs injection on 20140517-004905
Merge commit '7534afa41853941d3e20ccf75b2f7fecaa357e3d' into HEAD