fr injection on 20140610-005028
cs injection on 20140610-005028
Merge commit 'd54ba9a1beb9c521a6fc69943eca5f9e306d28d6' into HEAD