Sync'd branch integration/inbound with upstream @ Wed Nov  5 10:10:45 PST 2014