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