uk injection on 20140522-011653
Merge commit 'd6ba1a8906fb15e76d6bf6f01aeb8cff99c014c4' into HEAD