Added dependencies for extensions.
Merge branch 'trunk' into qfb