Sync'd branch integration/inbound with upstream @ Fri Nov  7 18:29:45 PST 2014