rebase to upstream

trying to rebase smack fork to upstream before applying my patch