Incorporate https://github.com/ctubio/tribeca/commit/a8d6a2c1eecc954549c24726c833e7a4dd903016
Incorporate https://github.com/ctubio/tribeca/commit/a8d6a2c1eecc954549c24726c833e7a4dd903016

michaelgrosner/tribeca,michaelgrosner/tribeca,michaelgrosner/tribeca