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