Sync'd branch integration/inbound with upstream @ Tue Nov  4 13:50:45 PST 2014