Sync'd branch integration/inbound with upstream @ Tue Nov  4 06:19:38 PST 2014