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