Sync'd branch integration/inbound with upstream @ Wed Nov  5 10:04:41 PST 2014