Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'