Sync'd branch integration/inbound with upstream @ Wed Nov  5 16:26:50 PST 2014