Sync'd branch integration/inbound with upstream @ Tue Nov  4 13:29:47 PST 2014