ro injection on 20140827-110021
Merge commit 'a387baf2a0dcfce785d9cc1b8d97c2fd13513226' into HEAD