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