metadata bug ifxes
merging upstream
Merge remote-tracking branch 'origin/metadata' into browserify
merge last changes from metadata editor