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