v1.0 (.orig files excluded)
Merge branch 'release/1.0'