Merge commit 'upstream/master'

* commit 'upstream/master':
  [DependencyInjection] made the loader extensions much more reliable and robust