Sync'd branch integration/inbound with upstream @ Mon Nov  3 16:56:40 PST 2014