Tweak to allow for case when weight is explicity None
Tweak to allow for case when weight is explicity None

edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform