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