More A* bugfixes!
Merge branch 'Niels' into develop