Merge pull request #1775 from shackbarth/build_app_dir