Sync'd branch integration/inbound with upstream @ Wed Nov  5 08:39:37 PST 2014