Merge branch 'docfix/mix_task_options' into 'develop'