Merge tag '1.5.2' into develop

v1.5.2

- Fix: 'git hf finish start' now sets the tracking branch correctly
- Fix: 'git hf update' now returns to the original branch correctly
Test
Merge branch 'release/1.5.5'