Sync'd branch integration/inbound with upstream @ Fri Nov  7 08:44:44 PST 2014