Merge commit 'd08cf83aace1c40952cc57fa1a12bc3891565250' * commit 'd08cf83aace1c40952cc57fa1a12bc3891565250': Minor fix to the plug-ins license.
Merge commit 'd08cf83aace1c40952cc57fa1a12bc3891565250' * commit 'd08cf83aace1c40952cc57fa1a12bc3891565250': Minor fix to the plug-ins license.