Sync'd branch integration/inbound with upstream @ Mon Nov  3 04:17:46 PST 2014