Sync'd branch integration/inbound with upstream @ Wed Nov  5 04:37:34 PST 2014