de injection on 20130927-050715
Merge commit '1acdd1b1ebb0982aabf8ee2e5d67f406fd84cbb9' into HEAD