Rebase from 'upstream' @ version '1.0.4'