Fix hang in incremental build

Fix hang on incremental build
Merge pull request #73 from csrwng/fix_incremental_hang

Fix hang in incremental build
Fix typo
Merge pull request #77 from danmcp/master

Merged by openshift-bot