Sync with updates made outside this repo
Merge pull request #1 from vistarmedia/feature/sync

Sync with updates made outside this repo