Sync'd branch integration/inbound with upstream @ Tue Nov  4 06:33:32 PST 2014