Sync'd branch integration/inbound with upstream @ Thu Nov  6 13:00:48 PST 2014