Sync'd branch integration/inbound with upstream @ Tue Nov  4 12:58:34 PST 2014