airblade/paper_trail — pull request #442 by coberlin (2014-11-20 13:41:14+00:00)
Title: Fix merge of metadata from controller

This fixes the merge of metadata that is set from the controller.