Merge branch 'skaufman/find_or_create'
skaufman [Wed, 13 Aug 2014 15:07:01 +0000 (16:07 +0100)]

Trivial merge