Make propTypes DEFINE_MANY_MERGED
Merge pull request #487 from spicyj/multi-proptypes

Make propTypes DEFINE_MANY_MERGED