Prop namespacing
Merge pull request #893 from html5rocks/master

Prop namespacing