uk injection on 20140522-011653
Merge commit '931d9e36e8310c7a5e8189bf91cea7cc6bd4fc74' into HEAD