Sync'd branch integration/inbound with upstream @ Mon Nov  3 11:48:42 PST 2014