uk injection on 20140925-005028
Merge commit '4e410a32db57ce4be8f8b586546a67f6446963b3' into HEAD