Sync'd branch integration/inbound with upstream @ Fri Nov  7 09:24:49 PST 2014