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