Merge pull request #493 from marcsaegesser/master

Rebuild IncrementalBuilder