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