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