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