Merge branch 'bugfix/get_path_trailing_slash'