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