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