cs injection on 20140417-004849
Merge commit 'ea8ad3c1233f384e58c6462da092d057ac37dc04' into HEAD