398 - Fixing Mike's deletion of metadata.rb
Merge remote-tracking branch 'origin/master'