Sync'd branch integration/inbound with upstream @ Mon Nov  3 00:17:45 PST 2014