Put the magic meta viewtag in ;-)
Merge branch 'dev'