Fixed "prop is undefined" error (from line 491).
Merge origin/master