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