cs injection on 20140517-004905
Merge commit 'deb6cbc59f44922170b2b5ee3dbf1b8ad514549e' into HEAD