cs injection on 20140701-005047
Merge commit 'ad37a74e65b82862b9a013c0ac38e3bd2f091b4d' into HEAD