Sync'd branch integration/inbound with upstream @ Thu Nov  6 23:19:43 PST 2014