Rebase from 'upstream' @ version '0.2.18'