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