fr injection on 20140703-005131
Merge commit '86daeb74b58b4be702cf457ff259f1177aaf16cb' into HEAD