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