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