Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add metadata.txt to extra files for make deploy.
Merge pull request #6 from vpicavet/master

Fix missing metadata.txt for deploy rule in Makefile