Fix typo
Merge remote-tracking branch 'upstream/master' into refresh_on_prop_change