Sync'd branch integration/inbound with upstream @ Tue Nov  4 01:54:43 PST 2014