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