uk injection on 20140925-005028
Merge commit 'e39c8ea6c514304cc393fb98a2d95b5bd75bccc3' into HEAD