Update to qbs upstream
Merge pull request #21 from Hamper/master

Update to qbs upstream