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