Feature branches should (whenver possible) be based on upsteam's master
since

 - it eases upstream adoption
 - it makes sure features stay well separated