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