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