fr injection on 20140703-005131
Merge commit '7b6303085c6051b844ea8c726ee067f90ae71be1' into HEAD