cs injection on 20140415-004848
Merge commit '903f3bcf3b4c0d916ee7ecf699bc6e5efa8517fb' into HEAD