Fix options_for_prop where options[scope] is nil
Merge branch 'master' into 0.9-dev