ro injection on 20140905-005050
Merge commit '81e9527cd24dce72056a5d27d1b07324db7b4e0c' into HEAD