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