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