Update
Update
Update
Update
Update
Update
merging htordeux changes: only rotation updates & small fixes
hunter 5.4 stuff from HenrikGronholm  #402