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