Merge branch 'l2tp-module-autoloading'