ro injection on 20140907-005044
Merge commit 'c150ec51b6a0830b55aa737cf64c32c3b26b58b7' into HEAD