Sync'd branch integration/inbound with upstream @ Tue Nov  4 17:00:38 PST 2014