de injection on 20130927-050715
Merge commit '76820d9508d1bc581cc3c6bbb3e522dd567c5001' into HEAD