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