de injection on 20140722-004943
Merge commit '0aaf732421183348b6ff5f8ed743b7fa44fa7353' into HEAD