Update for Yosemite

Pulled from Jeff, makes the warnings go away. :smile:

Not submitting as a PR upstream since we're targeting 10.10 with this.