Sync'd branch integration/inbound with upstream @ Sat Nov  8 08:39:55 PST 2014