cs injection on 20140712-004944
Merge commit 'c77c93877db257f18c5a85ff428f7ebb0e10e52f' into HEAD