ro injection on 20140907-005044
Merge commit '5d1f1805bee57e932f68cff2546c1f21c31bc8da' into HEAD