include assistedinject, could be useful in certain circumstances.
Merge branch 'master' into features/option-tab-complete