Updated the submodule so it builds
Merge branch 'refs/heads/submodule-update'