fr injection on 20130827-050012
Merge commit '89d97bd4d8093324b3b59179d8e7421e15db1d41' into HEAD