Merge pull request #1559 from auouymous/tilde-expansion