Sync'd branch integration/inbound with upstream @ Tue Nov  4 14:02:41 PST 2014