Rebase from 'upstream' @ version '0.0.4'