Merge remote-tracking branch 'origin/wipdev'
Merge branch 'master' of https://github.com/Guts/Metadator