am 019eca1a: (-s ours) am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '019eca1a7920da9cf5dc7efebb7d24b86561a989'

* commit '019eca1a7920da9cf5dc7efebb7d24b86561a989':
  Ignore hidden files and vi swap files during packaging. (do not merge)