Pulling in changes from master branch.
Quick fix. Let's go go go!
Merge branch 'staging' of ssh://git@github.com/jeffsegall/maestro.git into staging-trajectory
Merge remote-tracking branch 'origin/staging-trajectory' into staging-trajectory