Merge branch 'develop'
fix handling of disabled UI modules so that the toolbar entries match
their tasks.