Sync'd branch integration/inbound with upstream @ Wed Nov  5 20:58:41 PST 2014