Sync'd branch integration/inbound with upstream @ Thu Nov  6 04:55:40 PST 2014