cs injection on 20140415-004848
Merge commit 'd9e73cb9275753b19a380aa4d0dd936c4cee3971' into HEAD