Fixes T1036: removed the extra slashes
Refs T1036: get app_dir from config
Merge branch 'master' into develop