Fix the way disabled is dealt with.
Merge branch 'develop'