Merged upstream/newdev for testing.
Merge pull request #1 from foolishbrilliance/newdev

Merged upstream/newdev for testing.