Merge pull request #792 from vincentbernat/fix/out-of-tree-build