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