Sync'd branch integration/inbound with upstream @ Mon Nov  3 23:39:41 PST 2014