Move ht branch to master (old master is now 'upstream')