uk injection on 20140925-005028
Merge commit '94d88bdf48925692c70c3492d6fdb0e066214396' into HEAD