Sync'd branch integration/inbound with upstream @ Wed Nov  5 18:15:43 PST 2014