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