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