Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 4 Aug 2014 18:12:51 +0000 (14:12 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 4 Aug 2014 18:12:51 +0000 (14:12 -0400)

Trivial merge