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