Fixes tr1/tuple not found error on Yosemite

See issue at http://bit.ly/1zRd3nw.

Submitted for fast-forward merge