Merge branch 'metadata-editor' into metadata
authortilly-Q <nattilypigeonfowl@gmail.com>
Mon, 12 May 2014 16:26:07 +0000 (12:26 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Mon, 12 May 2014 16:26:07 +0000 (12:26 -0400)

Trivial merge