Fix UnicodeDecodeError when dir_limit_depth and dir_shorten_len are set
Merge remote-tracking branch 'dbrodie/unicode_path_fix' into develop