Fix New Hope always being relocated
Merge remote-tracking branch 'shadmar/master'