Even more bugfix (2.1.12.294)
Merge path autocomplete (2.1.12.294)
Bugfix (2.1.12.294)