Changes description of mixin - props @r007

Relates to #582
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Changes description of mixin - props @r007