Merge branch 'imagemeta' into testing