Merge pull request #1697 from shackbarth/buildapp