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