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