Merge branch 'master' into dev
Merge pull request #1 from cconover/dev

Merge branch 'master' into dev