Merge branch 'develop'
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Sync with genesis.
Merge pull request #2 from nathanrice/develop

Sync with Genesis