Sync'd branch integration/inbound with upstream @ Fri Nov  7 15:31:45 PST 2014