Merge branch 'bw/push-options-recursively-to-submodules' into maint