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